fix(nextcloud): truly not require SSE-C - #643
Closed
jstewart612 wants to merge 0 commit into
Closed
Conversation
jessebot
self-requested a review
October 20, 2024 10:49
jessebot
requested changes
Oct 20, 2024
jessebot
left a comment
jessebot
left a comment
Collaborator
There was a problem hiding this comment.
Looks good, can be uncomplicated just a bit though :)
| key: {{ .Values.nextcloud.objectStore.s3.secretKeys.sse_c_key }} | ||
| {{- else }} | ||
| {{- end }} | ||
| {{- if and (gt (len .Values.nextcloud.objectStore.s3.sse_c_key) 0) (lt (len .Values.nextcloud.objectStore.s3.secretKeys.sse_c_key) 1) }} |
Collaborator
There was a problem hiding this comment.
Suggested change
| {{- if and (gt (len .Values.nextcloud.objectStore.s3.sse_c_key) 0) (lt (len .Values.nextcloud.objectStore.s3.secretKeys.sse_c_key) 1) }} | |
| {{- if .Values.nextcloud.objectStore.s3.sse_c_key }} |
We don't actually need to calculate the length, as if this is not an empty string, it will trigger. My above suggestion should work fine.
jessebot
added
2. developing
wrenix
requested changes
Mar 6, 2025
wrenix
left a comment
wrenix
left a comment
Collaborator
There was a problem hiding this comment.
After the change, you should rebase and fix the version dump.
| {{- if and (gt (len .Values.nextcloud.objectStore.s3.sse_c_key) 0) (lt (len .Values.nextcloud.objectStore.s3.secretKeys.sse_c_key) 1) }} | ||
| - name: OBJECTSTORE_S3_SSE_C_KEY | ||
| value: {{ .Values.nextcloud.objectStore.s3.sse_c_key | quote }} | ||
| {{- end }} |
Collaborator
There was a problem hiding this comment.
change the order of evaluote first if sse_c_key is set (and then existingSecret) so that we has the name: OBJECTSTORE_S3_SSE_C_KEY just once and.
It is for me better readable (maybe we change the idea of if and with) ...
Suggested change
| {{- end }} | |
| {{- with .Values.nextcloud.objectStore.s3.sse_c_key }} | |
| - name: OBJECTSTORE_S3_SSE_C_KEY | |
| {{- if $.Values.nextcloud.objectStore.s3.existingSecret }} | |
| valueFrom: | |
| secretKeyRef: | |
| name: {{ $.Values.nextcloud.objectStore.s3.existingSecret }} | |
| key: {{ . | quote }} | |
| {{- else }} | |
| value: {{ . | quote }} | |
| {{- end }} | |
| {{- end }} |
wrenix
marked this pull request as draft
March 6, 2025 15:53
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of the change
Make SSE-C truly not be required just as the upstream project does not require SSE-C.
Benefits
Make SSE-C truly not be required just as the upstream project does not require SSE-C.
Possible drawbacks
None: only makes Helm chart more compliant with available upstream options.
Applicable issues
Additional information
Checklist
Chart.yamlaccording to semver.